Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 2 Mar 2011 04:40:07 +0000 (20:40 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 2 Mar 2011 04:40:07 +0000 (20:40 -0800)
commit3df8bfbf0887392564f870db01220bb1c6672396
tree03c1646fd1b787f497e1f5e1c2b53a9d93085e8d
parent45e4dea8f312b82b6ee2b6b850f1d71d3c217f54
parent2a832763eb5cc7be8f3b6dd4bd3bfb107d99ff15
Merge from mainline.